Merge pull request #3642 from Montellese/video_context_cleanup_continued