CDB-1604 Fixed and improved specs to take into account new privacy flows