backport: Merge bitcoin#25118, 25430, 25394 #6518
+30
−28
Draft
Loading