Merge "Fix velocity reporting for negative values > -1"