Applied x2b Copy/Swap Patches Manually (did not merge cleanly)