[IMP] Bugfix

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

Closes RR-385

Merge request reports