[ADD][FIX] Add opctionals in refunds

Merged diego.barreto requested to merge FIX into 12.0

Merge request reports