backport: Merge bitcoin#28787, 23083 #7031
+58
−17
Draft
Loading