Merge branch 'placeholder' into 'master'

placeholder

See merge request !1724
2 jobs for master in 1 minute and 16 seconds (queued for 1 second)