caf/korg upstream merges