Merge branch 'rs/daemon-plug-child-leak' into maint