12 Commits (feature/nav_tuning)