Merge commit 'd3cf0544cc7eec8ace3dc3b7fc17b7dac69e0aab' * commit 'd3cf0544cc7eec8ace3dc3b7fc17b7dac69e0aab': Optimize VelocityTracker to run in linear time.