CON-1654 | Changes after CR