Cherry-pick 'tag fix updated' into release/0.7

David Diederichrequested to merge
cherry-pick-91d9e1bd into release/0.7

This merges !162 (merged) into the release branch for patching

Merge request reports