Merge branch 'patch/JAL-4008_jabaws_2_2_1_patch' into doc/release_2_11_2_3