Merge "Fixes in WorkflowAction"