Merge branch 'fix-pr9400' into maint