Merge branch 'ms/daemon-doc-typo' into maint