Merged with mainline.