Some fixesfor the roles rename.
Merge branch 'test' into dev
Build.