[ADD] changes and fixes

Merged Ignacio Goitea requested to merge 12.0-changes into 12.0-stage

Merge request reports