Adds headers to the protected views
Merge CDB-1316 into release/2.11.0