starting to backport more from native-soundtouch branch