Rebased on 4e9d7a590f364782a170d0f419ebf0a339b02469