Revert "Merge branch '12.0-res-config-settings' into '12.0-stage'"

Merged Gastón Bertolani requested to merge 12.0-stage into 12.0

This reverts merge request !9 (merged)

Merge request reports