Added CORS support
Merge remote-tracking branch 'origin/81317942-add-cors-support'