Merge "Change PatchTable pointer when loading patch"