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

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