Merge branch 'dev', remote-tracking branch 'origin' into dev
Merge remote-tracking branch 'origin/dev' into dev
Do not change transaction object on partial delivery

Changing it caused the wrong report to generate for partial deliveries.