Migration to Spring 3.2.3