Please include mainline commit 5088814a6e93 into 4.17.y