use delivered amount if present
Merge branch 'master' into consensus-network