Resolve RF-161 "12.0 "

Merged Facundo Benítez requested to merge 12.0-RF-161 into 12.0-stage

Related to RF-161

Merge request reports