some merge from audio-extr-test branch