Merge branch 'bug/JAL-2722' into releases/Release_2_10_2b1_Branch