CON-1442 | GlobalNav fixes after merge