0.27.06 (Nivve) compatch 2.1.1 - defines and cb_types