Merge pull request #5956 from nabinhait/guardian_patch_fix

[patch] fixed reload doc and permission issue in guardian patch