Merge "Actually interpolate the time value." into tm-dev