Resolve RR-55 "12.0 "

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

Closes RR-55

Merge request reports