Merge "OOM-Refactor CLM project block"