Merge pull request #7322 from remitamine/vgtv