Merge "Fix pointer indexing issue in VelocityTracker." into jb-dev