Merge pull request #3360 from nabinhait/develop

patch fix