[IMP] Improve display

Merged Luciano Ortiz requested to merge cherry-pick-4143fdaf into 12.0

(cherry picked from commit 40cb64a0)

(cherry picked from commit 4143fdaf)

Merge request reports