Merge branch 'jk/daemon-fixes' into maint