Merge "INT-Refactor CLM project block"