Merge commit '334b861e3339bc7189372f790d0c0e2043d160a3' * commit '334b861e3339bc7189372f790d0c0e2043d160a3': Propagate optional audio stream type to the creation of the audio resources
Merge commit '334b861e3339bc7189372f790d0c0e2043d160a3' * commit '334b861e3339bc7189372f790d0c0e2043d160a3': Propagate optional audio stream type to the creation of the audio resources