Merge "ES non-root"