Merge "PORTAL-Refactor CLM project block"