Merge branch 'sh/daemon'