Add privacy fixes
Merge branch 'master' of https://github.com/tanbrian/zendesk_test_app