Resolve RR-67 "12.0 "

Merged Felipe Carlini requested to merge 12.0-RR-67 into 12.0-stage

Closes RR-67

Merge request reports