Merge pull request #11694 from neheb/v4l