Merge "PORTAL-SDK-Refactor CLM project block"