Synced with changes in private repo.