Merge branch 'news-and-vid' into 'master'