Moved from core-spring-demos