Sync with oak changes