Add reference to handlers list
Merge branch 'develop' into workflow_support