Merge branch 'nd/daemon-log-sock-errors'