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 4af1d5c21fc2f1e4e9cff9ed18f2c004e22c2913 [formerly 1448b8cdc8231ca3d6a7daff77dc12c1a4edb4e2])

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

Former-commit-id: e4518ecc3f7e2a0942ac53f49832e9d4f8f8318f