Fixed springer issues urgently needed.
Merge branch 'fix_springer'