Merge branch 'develop' into 'master'

Regular merge of develop

See merge request !131
1 job for v2.8.0 in 4 minutes and 21 seconds
latest