Merge release 1.17.0 into 2.0.x#167

DavidBadura merged 22 commits into2.0.xpatchlevel/hydrator:2.0.xfrom

1.17.x-merge-up-into-2.0.x_fkbQGuYVpatchlevel/hydrator:1.17.x-merge-up-into-2.0.x_fkbQGuYVCopy head branch name to clipboard