Merge branch 'migrate-legacy-tags' into 'develop'