Merge branch 'develop' into 'master'

Develop merge

See merge request !278
2 jobs for master in 51 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Test7.4
passed #14920
test7.4

00:00:26

 
  Test8.0
passed #14921
test8.0

00:00:24