Merge branch 'JAL-1292_regression' into Release_2_8_1_Branch