Merged from BPMN camp