Merged with the private repo changes.