Merge "AreaId is not expected for the Vms VehicleProperty"