1.5 - Support CB changes mid-1.5.1