Merge branch 'tg/next__fix_media/vimeo' into next