not sure how anyone even used privacy manager with this broken
Merge branch 'release/12.0' into release/13.0