Merge pull request #6311 from nabinhait/patch_hotfix_1

Patch fixed