[BLEEDING/INSTABLE] Set CompatCBDev to support 1.6.1 changes.