Merge branch 'bug_358_support_streamid_extension'