debug refactor (again), async basesql.extract, async activity_import
Merge branch 'activity'