Merge pull request #2739 from arian/element-event-typewriter