Privacy Panel merge with v2.1