Merge "Implement an integrating VelocityTracker strategy." into jb-dev