Merge pull request #3471 from nabinhait/develop

Hotfix