ps:P-222801 tokenized Velocix vod support

@erankor  - merge to most recent branch