More events added
Revert "Fix white-spaced condition exception"

This reverts commit 469d80896b5126627ab728b622a50560aa0dd062.
Fix white-spaced condition exception
Merge remote-tracking branch 'origin/white-spaced-condition'