Merge branch 'ew/daemon-socket-keepalive' into maint