Merge branch 'JAL-1286' into Release_2_8_Branch