Resolve RAFC-93 "12.0 "

Merged Ariel Caruso requested to merge 12.0-RAFC-93 into 12.0-stage

Closes RAFC-93

Merge request reports