updated for BeatsAudio merge to core build