Merge "More VelocityTracker refactoring." into jb-dev