CON-1809 | Some changes after CR