Dev/ref#204 - Intermediate delivery