merged with vehicle branch