Upgrade eXo components to CR1