Merge "Revert "Conform to 1D VelocityTracker""