Merge branch 'develop' into 'master'

2.5.2 merge

See merge request !230
2 jobs from master in 1 minute and 16 seconds (queued for 7 seconds)
Status Job ID Name Coverage
  Test
passed #2251
test:7.2

00:00:41

passed #2252
test:7.3

00:01:14