Merge "WorkflowAction, traverseAAIService refactoring stage 1"