Backported AUX fix