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

Former-commit-id: 1448b8cdc8231ca3d6a7daff77dc12c1a4edb4e2