Merge: contrib: Introduce refund