Resolve RR-392

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

Closes RR-392

Merge request reports