Sync with main fork