Merge branch 'ds/add-missing-tags'