[FIX] Fixes

Merged diego.barreto requested to merge 12.0-FIX-VOUCHERS into 12.0

Merge request reports