Merge branch 'vim' into feat/persistent-undo