Merge pull request #3927 from tritao/updated_offsets_tool