Dispatch non-periodic events - EUCA-9348

EUCA-9348
Merge remote-tracking branch 'origin/dev/sjones/EUCA-9348' into testing