Add version count to entry
Remove useless inline help fields
Merge branch 'master' into auto-join-public-shared-group