Merge latest updates form original repo.

Merge latest updates form original repo.