Fixes some code examples for navigation tutorial
Merge remote-tracking branch 'origin/pr/1270' into develop

Forward port #1270