Issue 15865 - added AUD support