Merge pull request #3430 from nabinhait/develop

Multiple fixes