Merge pull request #5000 from nabinhait/develop

Minor fixes