Merge "Properly handle stopping related users" into main