Merge "Add proper interpolator to controls" into rvc-dev