Vid 2099

DO NOT MERGE.

This will go into VideoSprint60 once that branch is created.