Merge "Fix OOM settings"