Merge branch 'JAL-1226' into Release_2_8_1_Branch