Merge branch 'dsa-tag-cleanups'