Pull request https://github.com/OpenZeppelin/openzeppelin-contracts/pull/1943 needs some changes before being merged. The original author isn’t replying, so if anyone would like to pick it up please do! Make sure to take the PR branch and commit on top to preserve authorship of the existing work.

Also take a look at the original issue for context!