CON-1448 | Global Navigation CR fix