Merge pull request #3409 from nabinhait/develop

Multiple fixes