Merge branch 'vi-mode-wip' into temp-merge