Draft: Fixed Offset tool - fixes #1634, #1635