Merge branch 'sg/daemon-test-signal-fix'