merge in video extension updates