[FIX] YPF-195 & YPF-197

Merged Ignacio Goitea requested to merge 12.0-fix-error into 12.0-stage

Merge request reports