Merge "CLAMP-Refactor CLM project block"