Merge "Switch to impulse VelocityTracker strategy"