Re: Request for backporting 72a9c673636b