CDB-1604 Privacy changed, pending deep tests and adapting related specs (that will now fail)