Merge "Fix OOM Clamp"