Back-ported
Back-ported missing files
Content privacy install code
Fixes