General prep for new content_privacy module (ref issue #17)
Adopt bug fixes from master into dev