[3.8] Patch cors