Minor changes to process_delivery
Merge branch 'master' into Thomas-old