Upgrade to latest calipso