Catch up with upstream audit changes