changes  in Spring context
Merge origin/master