[Privacy Panel] pull request - all changes combined into one commit