Merge pull request #640 from pushkarnk/sr2631