Add links and permission-improvements to tags.
Merge branch 'release/2.5.1'