Merge branch 't/daemon_cleanups'