Merge branch 'wip/hadess/updates' into 'master'

Wip/hadess/updates

See merge request !3
2 jobs from master in 3 minutes and 18 seconds (queued for 1 second)
Status Job ID Name Coverage
  Deploy
passed #1862
pages

00:03:18

passed pages:deploy

00:00:00