11.0 fix usd issue

Merged Agustín Isola requested to merge 11.0-FixUSDIssue into 11.0-stage

Merge request reports