Merge "WorkflowAction refactoring"