Merge from uaudio branch.