Merge branch 'cherry-pick-2b6b5ea9cf-master' into 'master'

Sweeping !14480 from 21.1 to master.
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!14537