Merge "Allow Multiple Triggers and Simulate DSP Events"