"fix for privacy policy"
Merge branch 'develop' into staging