[PATCH 5.10 0/4] Backport of e89c2e815e76 to linux-5.10.y