Merge "Video source test & bugfix" into nyc-dev