Backport CORS fix to dev

Merge request reports

Loading