Merge branch 'fix-pr12041' into maint