Merge privacy enhancements (bug #2091)