Fixed the claim permission
Fixed update feature
Merge branch 'refs/heads/2.4.1'
Merge remote-tracking branch 'refs/remotes/origin/master'