replace files/patch-index.c in pr 40741 with this one
State Changed From-To: open->closed committed, thanks