2 Commits (fix-selection-events)