Merge pull request #3559 from nabinhait/develop

Fixes