Xpath fix

Merged Federico Pérez Diduch requested to merge xpath-fix into 12.0-stage

Merge request reports