Re: Backport of 3f29770723fe