Merge "Different previous velocity calculation"