Boundary event

Merging changes to support complex workflows back into master