Upgrade to CR4-SNAPSHOT