Synced with original repo.

Synced with original repo.