First version that auto-generates the inherited states and properties
for all roles.
Merge remote branch 'origin'