Merge branch 'master' into develop
Enable CORS
Merge branch 'develop'