Merge "Fix missing single-step event"