- Add vehicle tracking workaround from 1.12.2 branch