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

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