cval3 (with a hack to support charts 1.X licenses) #13605

Change-Id: If73f699a3c37389b956b239067d9e07e64cdad72