Bug 4517/dev/correct vzps use