Initial commit for Spring 4 upgrade