CON-1808 | Changes after CR