Merge "APPC-Refactor CLM project block"