Backport of commit a75bb4eb9e565b9f5115e2e8c07377ce32cbe69a