Merge branch 'develop' into 'master'

2.8.0 merge

See merge request !272
1 job for 2.8.0 in 20 seconds (queued for 3 seconds)
latest
Status Job ID Name Coverage
  Test
passed #11339
test

00:00:20