CON-1298 part of CR fixes