feature #2911: Make use of new VIClient class