Merge branch 'JAL-1322' into Release_2_8_1_Branch