Merge branch 'staging' into 'master'

exchange icon

See merge request !404
4 jobs for master
in 7 minutes and 53 seconds and was queued for 2 seconds