Merge pull request #3322 from grendello/offsets-tool-xa