Sort our agent star style
Merge branch 'notable-associations'