Tags styling consistency
Merge branch 'develop'