Merge branch 'JAL-1259_hotfix' into Release_2_8_Branch