Merge in CORS for quickstart_base