Merge branch 'rs/daemon-interpolate' into maint