Merge branch 'bugfix/csp-unproxied' into 'develop'