[fix] mig

Merged Santiago Apel requested to merge fix_mig into 12.0-stage

Merge request reports