Merge branch 'rs/daemon-hostname-in-strbuf'