Migrated from Global Marker to per Aggregation Group markers

[siavashs]

Markers should have their own dedicated marker instead of a shared global one.
We should ensure that this change does not affect behaviour or API responses.

Also see #4727