12.0 small fixes

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

Merge request reports