Merge pull request #3504 from nabinhait/develop

Multiple fixes