sticky user roles
Content #6043
Feature #6046
Merge branch 'master' into pinauthintegration