Merge branch 'nd/config-misc-fixes'