Re: v6.3 backport request