CON-1447: Fixes after merge