Merge branch 'video-error-case' into release