Merge "Making POD run as non-root"