Merge branch 'WIP_fix_JAL-1423' into Release_2_8_Branch