Merge "remove client token passing active VI service" into rvc-dev