Merge branch 'JAL-1316' into Release_2_8_Branch