Merge Patches from xjjx