Code

Merge branch 'ms/daemon-timeout-is-in-seconds'