Merge branch 'staging' into 'master'

Release version 8.5

See merge request !1
2 jobs for master in 1 second (queued for 7 seconds)
Status Job ID Name Coverage
  Test
passed #28500
build

00:00:00

passed #28501
production

00:00:00