Merge "Metric velocity on VelocityTracker" into main