Re: 6.4-stable backport request