Merging changes to mainline.