Merge branch 'upstream' into bugfix-video