Importing updates from original repo

Importing updates from original repo