Merge spring into master after Sprint 1 is completed