Moving to Spring 4.0.7