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

V2.1 dev

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

00:01:45

 
  Build
passed #49440
build

00:02:27

 
  Deploy
passed #49441
deploy

00:03:08