Merge "Reland "Conform to 1D VelocityTracker" (--try 2)"