Merge branch 'develop' into 'master'

2.5.2 merge

See merge request !230
2 jobs from 2.5.2 in 3 minutes and 23 seconds (queued for 32 seconds)
latest
Status Job ID Name Coverage
  Test
passed #2253
test:7.2

00:01:17

passed #2254
test:7.3

00:02:05