Something wrong with EnableCors
Implementing OPTIONS manually for now
Merge branch 'hotfix/enablecors' into develop