CON-1787: CR changes part 2