Merge "RampAnimator should use original target on last animation step" into udc-qpr-dev