Merge pull request from p2pu/hotfix-2019-05-cors Hotfix 2019 05 cors