[RM]Fix vat

Merged Gastón Bertolani requested to merge 15.0-fixes into 15.0-stage

Merge request reports