merged engine upstream