CON-1787: 1st part of changes after CR