Commit CORS related changes