Merge branch 'JAL-1347' into Release_2_8_Branch