Merge branch 'bc/maint-daemon-sans-ss-family' into maint