Merge branch 'update_2_1' into '2.1'

Update 2.1

See merge request !500
3 jobs for !500 with update_2_1 into 2.1 in 7 minutes and 4 seconds (queued for 4 seconds)
latest
Status Name Job ID Coverage
  Prepare
passed devel-container-merge-request #734565
docker-runner

00:04:27

 
  Build
failed compile-merge-request #734566
docker-runner

00:02:37

 
  Test
skipped unit-tests #734567
docker-runner
 
Name Stage Failure
failed
compile-merge-request Build
cache hit rate                     88.60 %
called for link 12
called for preprocessing 6
compile failed 2
cleanups performed 0
files in cache 2843
cache size 264.8 MB
max cache size 5.0 GB
ERROR: Job failed: exit code 1