[IMP] Updates

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

Closes RR-397

Merge request reports