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