Fix duplicate tag error during test run
Merge branch 'api-tags-14' into migration-script