Merge branch 'bug/JAL-3765_Find_bugs_in_21112' into releases/Release_2_11_1_Branch