Merge "UserDetailsSettings uses Guest string, not Guest name" into sc-dev