Merge "Turn role management off by default"