Merge branch 'vh/config-interactive-singlekey-doc' into maint