Merge branch 'fix-pr11806' into maint