Finished Triggers
Merge branch 'ContinueOnTriggers'