Merge "Make snapping to dimension more flexible." into cw-e-dev