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

Closes RAFC-101

Merge request reports