Latest shared updates
Merge pull request #296 from bhariharan/unstable20

Latest shared updates