make sure privacy scope is completely reset on second delivery chain - revert if there are forum issues, this is subtle and complicated
also reset comment policy on alternate delivery chains
Merge remote branch 'upstream/master'