Merge "Make VelocityTracker 1D"