Merge branch 'jk/daemon-msgs'