Merge branch 'fix-csp-upgrade-insecure-requests-check' into 'develop'