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

V2.x master

See merge request !7
1 job for v2.1-dev in 30 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Test
passed #51713
test

00:00:30