fix video file test
Merge branch 'master' into upgrade-infrastructure
Merge branch 'upgrade-infrastructure' into docker