uac_redirect patch merged upstream. Will be included on next 4.0 series