Merge "MULTICLOUD-Refactor CLM project block"