Backport CORS fix to dev

Merged Martin Lowe requested to merge master into dev

Merge request reports