Merge branch 'JAL-1332_regression' into Release_2_8_1_Branch