Migrated to spring-loaded 1.2.0-dev