[bitcoin] Merged PR from glozow: [29.x] 33106 backport and final changes for rc2 https://github.com/bitcoin/bitcoin/pull/33226