Sync with cotrix changes
Added unit test on role assignment