CFY-642 add events support
Merge branch 'tempmergebranch' into feature/CFY-642-workflow-framework