Merge "Workflow refactoring - revert changes"