Merge branch 'vim-with-runtime' into feat/persistent-undo