Resolve RR-376

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

Closes RR-376

Merge request reports