Video sprint49

All sprint work for Video Sprint 49. Wait to merge until the video team gives the okay.