Merge branch 'cherry-pick-824c9e72 [formerly 8c5fde1f52]-21.0' into '21.0'

Sweeping !11641 from 21.1-dev to 21.0.
Improve somewhat the histogram fetching

See merge request atlas/athena!11674

Former-commit-id: c29231a828d2393e414aa2f336e413ab77696d3e