Merge pull request #1691 from esdrubal/exitevent