CON-554: Changes after 1st CR