Reordered core.patch