Merge pull request #4328 from nabinhait/hotfix1

[hotfix]