Merge "VID-Refactor CLM project block"