Please apply upstream commit 0a4e668b5d52 to v5.10.y