Merge "LOG-Refactor CLM project block"