Merge "Removes vehicle.default target"