Merge "TESTSUITE-Refactor CLM project block"