Merge branch 'sprint_2' into 'master'

[RELEASE] Sprint 2

See merge request !11
1 job for master in 8 minutes and 26 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #52126
build

00:08:26