Merge pull request #1767 from mahagr/develop

Merge changes from 3.0 branch
Update version to 3.1
Merge pull request #1768 from mahagr/develop

Update version to 3.1