Avoid event duplication
Merge branch 'phase2-fixes'