patches applied to yi / packages /