Merge "USECASE-Refactor CLM project block"