Merge branch 'rs/daemon-fixes' into maint