Fixes

Merged Santiago Apel requested to merge fixes into 12.0-stage

Merge request reports