Merge pull request #3551 from nabinhait/develop

Fixes