Merge branch 'refs/heads/t/daemonize-fix'