CON-1787: Changes afrer CR