Merge pull request #4771 from irfancharania/videott