Merge branch 'feature/cors' into 'develop'