ref #6925 Inject context into operations to allow sync/async execution
ref #6907 migrate remaining handlers