Merge "run mr containers as non root user"