Re: Backported version of upstream commit 4dbd633e90e0