Merge branch 'bugzilla-13577-video' into release