CON-1814 fixes after CR