Merge branch 'patchJAL-674_offset' into develop