Re: v6.1 stable backport request