[FIX] some fixes

Merged Felipe Carlini requested to merge 12.0-migration into 12.0-stage

Merge request reports