patches applied to yi / vty /