Update to Cilantro preview 4