Implement ck1 patchset, fixed build with it