Merge pull request #3316 from nabinhait/develop

share permission and patch fix