Merged with engine upstream.