Patches/1.x