Bug Fixes core: hydrate user defined discriminator columns (#831) (8671440), closes #827 core: refactor internals to reduce number of cycles (#830) (3994767)