Re: [trinity-devel] Backporting commit 1f39650