Merge "SO refactor - extract Workflow type Service Issue-ID: SO-3581"