modified the "create a vehicle" flow to contain two related entities
merged branch 2.1.x into 3.0.x