Merge branch 'nd/command-list' into nd/complete-config-vars