Merge "Replace the root command with user mode"