Merge branch 'develop' into 'master'

release merge 2.5.0

See merge request !223
2 jobs from 2.5.0 in 56 seconds (queued for 1 minute and 40 seconds)
Status Job ID Name Coverage
  Test
passed #1722
test:7.2

00:00:56

passed #1723
test:7.3-rc

00:00:54