Merge "Refactor WorkflowAsyncResource"