Merge branch 'patch_JAL-1004' into Release_2_7_Branch