Merge pull request #3561 from nabinhait/develop

Fixes