Pre-audio_options branck checkout commit
Final audio_options branch commit