Backport missing hydrators and optimizations