Merge branch 'JAL-1164_regression' into Release_2_8_1_Branch