[29.x] backport #33212#33251

fanquake merged 2 commits into

bitcoin:29.xbitcoin/bitcoin:29.xfrom

fjahr:29.x-backport-index-fixfjahr/bitcoin:29.x-backport-index-fixCopy head branch name to clipboard