Merge branch 'bug/JAL-2665-2.10.2b' into documentation/JAL-2675_release2102b1