On replay of orchestration, Activity.Current is null, loosing correlation for traces within an orchestration

I am facing a problem tracing using an ILogger. Things are working fine except for tracing happening on an orchestration (tracing during a activities is fine). Traces done from orchestration are not correlated (no operation_Id, or operation_ParentId). From looking at the code, there is not Activity.Current that is setup during the replay of an orchestration, which is needed to achieve correlation