Merge branch 'cherry-pick-4af1d5c2 [formerly 1448b8cdc8]-21.1' into '21.1'

Sweeping !14450 from 21.1-dev to 21.1.
Fix bug whereby a histogram plotted twice would be modifed twice

See merge request atlas/athena!14480

Former-commit-id: 2b6b5ea9cf41700257b0d561ceea878916f3a5e9