Merge "Add remaining hyp events"