merge ck patchset