CON-1787: Changes after merge