12.0 minor fixes

Merged Sebastian Kennedy requested to merge 12.0-MinorFixes into 12.0-stage

Merge request reports