Merge branch 'develop' into 'master'

Develop to master 2.5.1

See merge request !225
2 jobs from 2.5.1 in 59 seconds (queued for 5 seconds)
Status Job ID Name Coverage
  Test
passed #1763
test:7.2

00:00:28

passed #1764
test:7.3-rc

00:00:30