Merge changes on vendor branch into mainline.