Merge branch 'fix-pr11232' into maint