Cleanup and fix for trip drag.
Merge remote-tracking branch 'origin/develop' into develop