Merge pull request #4726 from nabinhait/develop

Multiple fixes