Sync with cktricky changes