[28.x] backports and finalize

5de225f - a year ago (PENDING)
Coverage report is currently being generated, please come back later.