Refund & Reversal Amounts

**Ready to merge**

Fixes #1086