Merge branch 'support-roles' into integrated