Sync with OORS updates