merging with lcg-cp