Merge branch 'vim' into feat/float-point-ext