Merge branch 'release/privacy_info'
Merge branch 'master' into develop