Switch to spring milestone 7