Allow CSP for images as well
Merge branch 'QA_4_0'