Merge "Make velocity tracker strategy configurable." into jb-dev