Merge branch 'develop' into 'master'

release merge 2.5.0

See merge request !223
2 jobs from master in 3 minutes and 55 seconds (queued for 4 seconds)
Status Job ID Name Coverage
  Test
passed #1720
test:7.2

00:02:09

passed #1721
test:7.3-rc

00:01:45