Resolve RR-66 "12.0 "

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

Closes RR-66

Merge request reports