CORS

Merged henokv requested to merge dev into master

Merge request reports