Issue #13302: backport part of 3ed28f28466f
1 file changed