CFY-642 refactoring
Merge remote-tracking branch 'origin/feature/CFY-642-workflow-framework' into feature/CFY-642-workflow-framework