Merge changes from yahoo repo