CON-1825 fixes after CR