Merging from mainline.