fix tags management
Merge branch 'dev' into public-cloud