Add spring
Merge branch 'feature/guard_init' into develop

* feature/guard_init:
  Add spring