Merge back improvements from PrivateSocial