performance fix for vehicle save
Merge branch 'Development_main' into v1_beta