Resolve RR-56 "12.0 "

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

Closes RR-56

Merge request reports