Revert "Trimmed the branch to only the waypoints_navigation sub directory"

This reverts commit a2e96d73fb8323f2aef339feac401fdffc583ae0.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the waypoints_navigation sub directory