Merge branch 'daemon-ext'