Merge "Run as non-root"