Updated branches for navigation_2d