v1.8.0 [merge-vehicle-issues]