CFY-642 apply graph refactoring and fix bug in graph creation
Merge remote-tracking branch 'origin/feature/CFY-642-workflow-framework' into feature/CFY-642-workflow-framework