Merge pull request #3599 from nabinhait/develop

Multiple fixes