Merged Anurag's changes from SVN.