CON-1709 | merge in CON-LocalNav