Merge branch 'release-v4.4' of https://github.com/OpenZeppelin/openzeppelin-contracts into patched/release-v4.4
