Rebase to rex/1076700-navigation and integrate