Merge branch 'Release_2_7_Branch_hotfix_JAL-962' into Release_2_7_Branch