New version copied from private repo.