Update privacy settings (history part)
version change
Merge branch 'master' into test_deployment