Manually merged VelocityTracker changes