Merge pull request #1686 from rmehta/develop

Fixes