[29.x] Backports

f2bd79f - 4 months ago (PENDING)
Coverage report is currently being generated, please come back later.