[REF] begin porting v8 base_delivery_...label

Seems to be near to be ready for merge
Still needs to be corrected here.