Merge "Use IoThread instead of BackgroundThread for HistoricalRegistry." into main