Reapply "merge revision(s) 62430c19c9f1ab49429cebe65f30588472648c95: [Backport #21342]"
This reverts commit c414b9871f263331cde0af1c08cf5c1a47e1aedf.
Reapply "merge revision(s) 62430c19c9f1ab49429cebe65f30588472648c95: [Backport #21342]"
This reverts commit c414b9871f263331cde0af1c08cf5c1a47e1aedf.