Bug/grains virtual xen

This commit fixes #13534