Merge branch 'add-manifest-src-to-csp' into 'develop'