Merge pull request #2093 from mojaves/pr-virt-domain-tag-fix