Changed default association_name back to roles
Merge branch 'applied_roles_fix' into solid