Basic ridesharing, [#54919086]
Merged from release-0.3
Merge branch 'support-basic-ridesharing' into release-0.3