backport: Merge bitcoin#24434, 23136 #6305
+6
−5
Draft
Loading