Merge branch 'rs/daemon-interpolate'