Re: backport new changes to 4.0.0