Merge "OPTF-Refactor CLM project block"