CFY-642 finish adding events
Merge branch 'tempmergebranch' into feature/CFY-642-workflow-framework