https://github.com/bitcoin/bitcoin/pull/17261/commits/f5be479694d4dbaf59eef562d80fbeacb3bb7dc1
---
Note: apparently this commit was already done in its own PR??? https://github.com/bitcoin/bitcoin/pull/17621/files
Partial backport of Core [[https://github.com/bitcoin/bitcoin/pull/17261 | PR17261]]