Add triggers support to behaviors
Merge branch 'pr/1647' into minor