Merge branch 'jk/daemon-user-doc' into maint