Privacy Panel rebased to v2.1