Merge branch 'v2.1-dev' into 'v2.x-master'

V2.1 dev

See merge request !8
3 jobs for v2.x-master in 2 minutes and 28 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Test
passed #52438
test

00:00:36

 
  Build
passed #52439
build

00:00:46

 
  Deploy
passed #52440
deploy

00:01:06