CON-1787: CR changes