Chameleon kits&cables merge fixes