Merge branch 'fix-pr11909' into maint