Resolve RR-423

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

Closes RR-423

Merge request reports