Merge "Fix virtualizationservice rules"