Pre-audio_options branck checkout commit