CON-1707 | Minor changes after CR