Added support for NMS v1_8_R1 (CB 1.8-R0.1)