Merge branch 'Release_2_8_Branch' into WIP_fix_JAL-1423