CON-1707 | More changes after CR