Handle video group membership.
Merge branch 'next' into deploy