Merge remote-tracking branch 'dstftw/multifeed-videos' (closes #6360)