Merge "Revert to lsq2 VelocityTracker strategy"