Merge "Implement new multi-user affordance."