[27.x] More backports

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