Merge pull request #2369 from Wikia/VideoSprint38

Video Sprint 38
Merge pull request #2429 from Wikia/VideoPerformanceDecember

Merge pull request #2369 from Wikia/VideoSprint38