patches applied to yi / Yi /