Merger updates from original repo.

Merger updates from original repo.