Merge branch 'topics/issues/1' into 'master'

Bugfix for Tags

See merge request tooling/qa-tools!12