Resolve RR-494

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

Closes RR-494

Merge request reports