backport: Merge bitcoin#29404, 28144, 28118 #7124
+156
−94
Draft
Loading