Merge changes  into audio-drivers.lnx.3.0