Fix for U-turn path case
Merge remote-tracking branch 'upstream/master'