Re: merge request for #10671