Merge after sprint

We successfully finished a sprint