Merge branch 'bug/JAL-1558' into Release_2_8_2_Branch_i18n