Merge branch '12.0-stage' into '12.0'

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

12.0 stage

See merge request !49 (merged)

Merge request reports