WIP: Hot fix

Closed Julián Corso requested to merge hot_fix into 12.0-stage

Merge request reports