Merge "Fix CL split and build"