CDV-4326 - Navigation changes