MAIN-3274 CORS Allow-Origin | Fix refactoring errors | Merge to preview

Merge to preview PR no #5584