Merge branch 'nd/config-misc-fixes' into maint