Merge "Bug 4957 Fix blocking call to Init RoleGet"