Merge changes  into audio-drivers.lnx.2.0