Merge "Remove VelocityTracker abstraction"