[IMP] Fix impounds

Merged Jose Luis Zanotti requested to merge RR-490 into 12.0-stage

Closes RR-490

Merge request reports