Fix the pipe main handle positions
Merge remote-tracking branch 'origin/master'