Merge release 1.24.0 into 2.0.x#197

DavidBadura merged 2 commits into

2.0.xpatchlevel/hydrator:2.0.xfrom

1.24.x-merge-up-into-2.0.x_6GHa1wgdpatchlevel/hydrator:1.24.x-merge-up-into-2.0.x_6GHa1wgdCopy head branch name to clipboard