12.0 fix errors

Merged Sebastian Kennedy requested to merge 12.0-fix-errors into 12.0-stage

Merge request reports