BC-1984 Fix Config in Spring 4