Merge pull request #324 from bhariharan/unstable20

Latest shared
Latest shared