Merged with engine upstream