No pluarlization in event domain
Merge branch 'release/v0.7'