Merge "Fix for OOM and Helm"