Privacy Panel pull request

All of the commits squashed into one.