Beta2 bug fixes. 31240, 31239, 31238, 31236, 31235, 31228
Merge pull request #5 from Jagadees-zyxware/master

Beta2 bug fixes. 31240, 31239, 31238, 31236, 31235, 31228