Add Vehicle Pop Up bugs fixed
Merge origin/development into development