COMMIT spring-e04 branches=1,2
