CON-1813 fixes after CR