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

Closes RAFC-100

Merge request reports