Hotfix/cdodge/video import export

@jzoldak here is the pull request onto Release

@dmitchell @cahrens @rocha can you do a quick pass and see if I got all your fixes in this new branch?

We're too late to do a deploy today. I'll put this up on Stage for testing tomorrow and we can discuss what we want to do regarding a Friday deploy.