[xss] improvement
WIP: multi-tenancy
Fixed events grouping bug
Merge branch '2.1'