Avoid adding role states that has no attributes
Merge branch 'fix-adding-empty-roles'