Merge branch 'sprint_2' into 'master'

[RELEASE] Sprint 2

See merge request !11
1 job for sprint_cordoba in 7 minutes and 42 seconds
Status Job ID Name Coverage
  Build
passed #57317
build

00:07:42