merge latest cantk code