Merge "SDNC-Refactor CLM project block"