Merge branch 'video-landing-page'