RoleFactory, Events
Merge origin/master