Build on CB 1.5.1-R0.2 (1.5.8)