Sync with Numa version