Merge "Fix clm build"