Merge "run container as non root user"