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

Closes RAFC-99

Merge request reports