bitcoinmerges 1756284443 [bitcoin] Merged PR from fjahr: [29.x] backport #33212 https://github.com/bitcoin/bitcoin/pull/33251
