improve/consolidate spring configuration options
Merge branch 'old-8.28'