Merge branch 'nd/daemon-informative-errors-typofix' into maint