Merge branch 'fix-pr9579' into maint * fix-pr9579: maintcheck: fix spurious failure regenerate Makefile.in