Issue #26962: Backport 23d986228c6b to 2.7
1 file changed