Merge "Start as non-root"