Merge "Fixes for OOM and Helm"