Update to 1.9.5: Support CB 1.7.8-R0.1