Merge "Add support for streams with vendor specific formats"