Trying to merge Nikolai commit in Spring-3