backport: Merge bitcoin#27151, 25849, 25077 #7128
+66
−37
Draft
Loading