Merge pull request #295 from bhariharan/unstable20

Latest shared commit
Pointing to latest shared
Latest shared updates