Merge branch 'JAL-686' into Release_2_8_1_Branch_i18n