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

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