Merge pull request #2308 from Montellese/13676_video_refresh