assign roles sooner
Merge branch 'master' into stable