Request for cherry-picking commit 4a625ce from Linus' tree