Merged upsteam