Support CB to 1.6.1 R0.1