Merge "Remove all vLB.CDS from package name"