https://github.com/bitcoin/bitcoin/pull/14494
This backport is already done. Should we close this task?