Merge branch 'jk/daemon-interpolate' into maint