test merge to preMaster
+ add simple changes to use Spring