Processing time is now separated from delivery_time
Merge branch 'delivery-time'

* delivery-time:
  Processing time is now separated from delivery_time