Team-revealif-with-roles and Minor fixes to last pull