Re: Backport of e607ff630c60 for 4.14 to 5.10