Merge branch 'JAL-1364_patch' into Release_2_8_1_Branch