Merge branch 'bugfix/csp-remove-form-action' into 'develop'