Merge "fix: Need a way to find the main user via shell"