Update to CB v1_7_R4