12.0

Merged Santiago Apel requested to merge 12.0 into 12.0-stage

Merge request reports