am eab674a8: Merge "Fix missing single-step event"

* commit 'eab674a87b32794ae2c5e7d238292e56804de09d':
  Fix missing single-step event