Merge branch '21.1-dev-tida-obj' into '21.1-dev'

Fix bug whereby a histogram plotted twice would be modifed twice

See merge request atlas/athena!14450

(cherry picked from commit 4af1d5c2 [formerly 1448b8cdc8231ca3d6a7daff77dc12c1a4edb4e2])

a4e1eb52 Fix bug whereby a histogram plotted twice would be modifed twice

Former-commit-id: 590c0ff23c82051d4f8d62120f20fadc0cd47716