Update to CB 1.6.1R0.1-SNAPSHOT