Merge "Starting measuring displacement from the edge of the slop zone" into main