Modified Hydrators to be per-query instances instead of a singleton-like approach.
Kept BC.
Merge branch 'DDC-2578' into 2.4