12.0 prod merge

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

Merge request reports