Merge in one commit

Merged Jose Luis Zanotti requested to merge 12.0-new-features into 12.0-stage

Merge request reports