Merge sparks-events repository