Merge branch 'hotfix/JAL-1530' into Release_2_8_2_Branch