Merge "[WIP] WorkflowAction refactoring"