backport OAC change