ref #6925 Inject context into operations to allow sync/async execution
ref #6595 Initial commit of migrated/refactored classes (not working)