Re: RFC: backport of commit a32c1c61212d