Merge "Sonar improvements in WorkflowAction"