2.5.4 tweaks for rolesInfo