Merge branch 'release/1.6'
Fix on admin, tags
Merge branch 'hotfix/AdminTags' into develop