10 Commits (bugfix/nav_mode_push_sync)