Update to CB 1.7