Several fixes re privacy
Merge remote-tracking branch 'origin/CDB-1604' into CDB-2566