Merge branch 'patchJAL-674_offset' into Release_2_8_2_Branch