Merge "MUSIC-Refactor CLM project block"