Merge branch 'as/daemon-multi-listen'