[29.x] Backports

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