Merge branch 'Audio-customizations' and fix