Followups for adding of tags

Merged Dave Patrick Caberto requested to merge SeaDve/bustle:followup into rustle

See individual commits

Merge request reports