Merge branch 'JAL-1526' into Release_2_8_2_Branch