Merge "workflowAction refactor"