~~This is a backport of Core commit 153d9dd9acffa95bb97a4b1579bd20237fdc9c52~~
~~note: it is part of PR16674 (https://github.com/bitcoin/bitcoin/pull/16674), my previous backports have been straight up merges so I am unsure as to how this summary should look~~
This is a backport of Core PR16674 - https://github.com/bitcoin/bitcoin/pull/16674