Merge branch 'hotfix/JAL-1521' into Release_2_8_1_Branch