Fixed the fix in only audio. Definitive commit ;)
Resolved an error with wrong stream ids
Merge remote-tracking branch 'upstream/master' into secure