Merge branch 'sprint1' into 'develop'

Sprint1 afterparty

See merge request !21
1 job for !32 with develop in 17 minutes (queued for 12 minutes and 58 seconds)
merge request