Update to CB 1.5.2-R0.2-SNAPSHOT