Fixed for ivendor frameworks/base and hardware audio.