Merged with engine usptream.