Merge branch 'patch_JAL-689' into Release_2_8_2_Branch