Resolve YPF-236 "12.0 fix "

Merged Santiago Said requested to merge 12.0-FIX-YPF-236 into 12.0-stage

Closes YPF-236

Merge request reports