Re: 6.1-stable backport