Created by: kordianbruck
Merge changes from Linnea
Merge details
@lpassing it would've been cool to Squash & Merge in order to get rid of all the test commits (Just for the future)
Squash & Merge