Merge branch 'js/daemon-log'