CONN-54 subtask CONN-196: Navigation updates.