Adjust data types of Ride
Merge branch 'master' into dev